auto merge of #1003 : jmesmon/cargo/update-for-nightly, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 3 Dec 2014 07:59:15 +0000 (07:59 +0000)
committerbors <bors@rust-lang.org>
Wed, 3 Dec 2014 07:59:15 +0000 (07:59 +0000)
commita0f0abca4f718e36ddc7cc23f9bce4c51d93cbe5
treee2f067cbc55137ce6e26adf3b95675991c2ad65a
parent5a80c023690bc6171eccadcc49075d1b3edec8ce
parent631210790dfd0a813545ab041e2fcc3df4e64fbe
auto merge of #1003 : jmesmon/cargo/update-for-nightly, r=alexcrichton

I'm a bit shaky on the profile.rs changes (`thread_local!` and `RefCell` relplacing `local_data_key!`), do make sure I haven't royally screwed something up there.